# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1496.1.19 -> 1.1496.1.20 # arch/ia64/kernel/acpi.c 1.56 -> 1.57 # include/asm-ia64/acpi.h 1.11 -> 1.12 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/12/19 bjorn.helgaas@hp.com 1.1496.1.20 # [PATCH] ia64: Remove unused ACPI functions. # # Remove unused functions: # acpi_get_prt() # acpi_get_interrupt_model() # acpi_get_addr_space() # -------------------------------------------- # diff -Nru a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c --- a/arch/ia64/kernel/acpi.c Sat Dec 20 00:39:05 2003 +++ b/arch/ia64/kernel/acpi.c Sat Dec 20 00:39:05 2003 @@ -610,66 +610,6 @@ return 0; } -/* - * PCI Interrupt Routing - */ - -#ifdef CONFIG_PCI -int __init -acpi_get_prt (struct pci_vector_struct **vectors, int *count) -{ - struct pci_vector_struct *vector; - struct list_head *node; - struct acpi_prt_entry *entry; - int i = 0; - - if (!vectors || !count) - return -EINVAL; - - *vectors = NULL; - *count = 0; - - if (acpi_prt.count < 0) { - printk(KERN_ERR PREFIX "No PCI interrupt routing entries\n"); - return -ENODEV; - } - - /* Allocate vectors */ - - *vectors = kmalloc(sizeof(struct pci_vector_struct) * acpi_prt.count, GFP_KERNEL); - if (!(*vectors)) - return -ENOMEM; - - /* Convert PRT entries to IOSAPIC PCI vectors */ - - vector = *vectors; - - list_for_each(node, &acpi_prt.entries) { - entry = (struct acpi_prt_entry *)node; - vector[i].segment = entry->id.segment; - vector[i].bus = entry->id.bus; - vector[i].pci_id = ((u32) entry->id.device << 16) | 0xffff; - vector[i].pin = entry->pin; - vector[i].irq = entry->link.index; - i++; - } - *count = acpi_prt.count; - return 0; -} -#endif /* CONFIG_PCI */ - -/* Assume IA64 always use I/O SAPIC */ - -int __init -acpi_get_interrupt_model (int *type) -{ - if (!type) - return -EINVAL; - - *type = ACPI_IRQ_MODEL_IOSAPIC; - return 0; -} - int acpi_irq_to_vector (u32 gsi) { diff -Nru a/include/asm-ia64/acpi.h b/include/asm-ia64/acpi.h --- a/include/asm-ia64/acpi.h Sat Dec 20 00:39:05 2003 +++ b/include/asm-ia64/acpi.h Sat Dec 20 00:39:05 2003 @@ -88,11 +88,8 @@ const char *acpi_get_sysname (void); int acpi_request_vector (u32 int_type); -int acpi_get_prt (struct pci_vector_struct **vectors, int *count); -int acpi_get_interrupt_model (int *type); int acpi_register_irq (u32 gsi, u32 polarity, u32 trigger); int acpi_irq_to_vector (u32 irq); -int acpi_get_addr_space (void *obj, u8 type, u64 *base, u64 *length,u64 *tra); #ifdef CONFIG_ACPI_NUMA #include